style: Make menuitems less bright when in checked state

Fixes #5665

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2388>

diff --git a/data/theme/gnome-shell-sass/_colors.scss b/data/theme/gnome-shell-sass/_colors.scss
index 0ca123b2a91848d2b72954a32a4da45af4dac124..c22bfea8231f97ca18fea454769f09538aad81c1 100644 (file)
--- a/data/theme/gnome-shell-sass/_colors.scss
+++ b/data/theme/gnome-shell-sass/_colors.scss
@@ -56,6 +56,10 @@ $backdrop_borders_color: mix($borders_color, $bg_color, 90%);
 $backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
 
 
+// derived checked colors
+$checked_bg_color: if($variant=='light', darken($bg_color, 7%), lighten($bg_color, 7%));
+$checked_fg_color: if($variant=='light', darken($fg_color, 7%), lighten($fg_color, 7%));
+
 // derived hover colors
 $hover_bg_color: if($variant=='light', darken($bg_color, 3%), lighten($bg_color, 10%));
 $hover_fg_color: if($variant=='light', darken($fg_color, 5%), lighten($fg_color, 10%));
@@ -63,7 +67,3 @@ $hover_fg_color: if($variant=='light', darken($fg_color, 5%), lighten($fg_color,
 // derived active colors
 $active_bg_color: if($variant=='light', darken($bg_color, 5%), lighten($bg_color, 12%));
 $active_fg_color: if($variant=='light', darken($fg_color, 5%), lighten($fg_color, 12%));
-
-// derived checked colors
-$checked_bg_color: if($variant=='light', darken($bg_color, 7%), lighten($bg_color, 15%));
-$checked_fg_color: if($variant=='light', darken($fg_color, 7%), lighten($fg_color, 15%));
\ No newline at end of file

diff --git a/data/theme/gnome-shell-sass/_high-contrast-colors.scss b/data/theme/gnome-shell-sass/_high-contrast-colors.scss
index d418e47ac41799f18f86450c370c351fc4f5013e..35e2d851a713265bd3c5fcbd5d6147a49c40769a 100644 (file)
--- a/data/theme/gnome-shell-sass/_high-contrast-colors.scss
+++ b/data/theme/gnome-shell-sass/_high-contrast-colors.scss
@@ -52,6 +52,10 @@ $backdrop_insensitive_color: lighten($backdrop_bg_color,15%);
 $backdrop_borders_color: mix($borders_color, $bg_color, 90%);
 $backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
 
+// derived checked colors
+$checked_bg_color: if($variant=='light', darken($bg_color, 12%), lighten($bg_color, 18%));
+$checked_fg_color: if($variant=='light', darken($fg_color, 12%), lighten($fg_color, 18%));
+
 // derived hover colors
 $hover_bg_color: if($variant=='light', darken($bg_color, 8%), lighten($bg_color, 20%));
 $hover_fg_color: if($variant=='light', darken($fg_color, 10%), lighten($fg_color, 20%));
@@ -59,7 +63,3 @@ $hover_fg_color: if($variant=='light', darken($fg_color, 10%), lighten($fg_color
 // derived active colors
 $active_bg_color: if($variant=='light', darken($bg_color, 10%), lighten($bg_color, 22%));
 $active_fg_color: if($variant=='light', darken($fg_color, 10%), lighten($fg_color, 22%));
-
-// derived checked colors
-$checked_bg_color: if($variant=='light', darken($bg_color, 12%), lighten($bg_color, 25%));
-$checked_fg_color: if($variant=='light', darken($fg_color, 12%), lighten($fg_color, 25%));
\ No newline at end of file

diff --git a/data/theme/gnome-shell-sass/widgets/_popovers.scss b/data/theme/gnome-shell-sass/widgets/_popovers.scss
index 4e6813a0d3c400024f9657ed55b138d319e53e05..4a86dd3fc12f3bab819d727c2d72f570c55fe2f6 100644 (file)
--- a/data/theme/gnome-shell-sass/widgets/_popovers.scss
+++ b/data/theme/gnome-shell-sass/widgets/_popovers.scss
@@ -100,12 +100,12 @@
       border-radius: 0 0 $base_border_radius $base_border_radius;
     }
 
-    &:focus,&:hover { background-color: lighten($hover_bg_color, 10%) !important;}
+    &:focus,&:hover { background-color: $hover_bg_color !important;}
     &:checked {
-      background-color: lighten($checked_bg_color, 10%) !important;
+      background-color: $checked_bg_color !important;
       &:focus,&:hover { background-color: lighten($checked_bg_color, 8%) !important;}
     }
-    &:active { background-color: lighten($active_bg_color, 10%) !important;}
+    &:active { background-color: $active_bg_color !important;}
   }
 
   .popup-menu-section {